From 4c4fc04e0ba32819cb5716ea2195737a2d09c532 Mon Sep 17 00:00:00 2001 From: Alex Z Date: Wed, 21 Jan 2009 03:50:08 +0000 Subject: [PATCH] Fix for r45862, handle indefinite blocks correctly (and use a less anglo-centric timestamp format) --- includes/specials/SpecialBlockip.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php index 3c305ad4f9..a83f535328 100644 --- a/includes/specials/SpecialBlockip.php +++ b/includes/specials/SpecialBlockip.php @@ -113,7 +113,11 @@ class IPBlockForm { $this->BlockEmail = $currentBlock->mBlockEmail; $this->BlockHideName = $currentBlock->mHideName; $this->BlockAllowUsertalk = $currentBlock->mAllowUsertalk; - $this->BlockOther = wfTimestamp( TS_RFC2822, $currentBlock->mExpiry ); + if( $currentBlock->mExpiry == 'infinity' ) { + $this->BlockOther = 'indefinite'; + } else { + $this->BlockOther = wfTimestamp( TS_ISO_8601, $currentBlock->mExpiry ); + } $this->BlockReason = $currentBlock->mReason; } } -- 2.20.1